Implemented search based on multiple keywords

Added some commenting and house cleaning