Added Search service. TODO fix null pointer crap