some code optimizations, old admin console filter changes

because forgot rescent code changes at work