renamed files to start with prefix 'Core'
fixed demographics mapping bug
fine tuned on dde_search issues