GH-18 Clean up code and bugfixes
GH-18 netlabel slection bugfix