Removed duplicate or, and queries
Update changelog
Remove or, and tests
Change table-xxx-db to table-xxx and table-xxx to table-xxx-default
Remove or,and tests