added new database structure to make searches more flexable