Merging changes from web
WIP on adding more search parameters