Clean up home controller a little bit
Add naive cat search