Switching between layers with no filtering options now behaves correctly
Changes made to combo box default value
Code style changes