Added ability to filter by type in basic menu