Added filter option to entityList