extended users mapping and refactored query