fixed logic for serving  multiple features