Fixing configuration
Fixing checks and cleanup
Categories order fix for db method