Added valid and errors back in search
Simplified access constraints / restrictions