Fixing lazy querying through where Class method