Fix address and user searching features