Fix search related and by title