Some DB fixes
Keywork Query param working