Prevent superfluous queries
CS tweaks
PSR4 switch