Small improved in performance - return keys instead return full entities

....