FIx and Make DB query to Fluent style