Fixed some run-time issue with the selection services.