Improve BSP selectors