SelectionController fixes + FF selections working