Changed the return type of findContactByParameterMap and findAddressByParameterMap