Fix for last commits (database related)
Optional fields filters in categories module