Changes for Select and Filter