changed to search scope, fixed views and controllers