Fixed some compliance stuff / db search / and db schema stuff ticket:8