Fix : Fully working Search service