Updated inventory management to make it cleaner and account for multiple filters

Hope I don't have to do this again :(