Added expand buttons for 'Where'