added jmapper annotations and fixed search