Yes, I messed this up FURTHER after it was messed up to begin with.  Mahogany Hills is now a place=suburb (as it is within Murrieta's city limits) and Murrieta is now correct, I believe.  Some subtle tagging required, and if we don't get it correct in two steps, how about three?!

Thanks for catching this and calling it to my attention.