Simplify annotations using bean scoping, fix search security interceptor