synching latest changes from OCRE to master; more facets in search forms and additional options in visualization