Search: added a spinner
Admin: first setup for field selection