Fixed search query and added TODOs