cleaned up db request system - added || (ORs) and took out if else bs