Removed extra query, set from address in the original record query