added states for search group
merged changes from new states for search group