Minor refactoring.
Filter zero values at the database.
Move filter into query.