Add content type checking in search method
Some minor changes