Search stuff

Added service fixes and search stuff