Added basic needs filtering