I do agree that they need to get back to this being about Rick. They need to continue to develop Ricks character too. Him being the main character isn't enough to say you can ignore his character depth.
That being said, the mortuary scene was some of the best poo yet. I want to know who lived there. The guy must be a world class psycho.
it was a trap