Changes to cater for qeuery parameter based search