Fixing instance transition

This took far too long to fix.
Hiding markers bug

Quick fix for markers not hiding when unfiltered.
Revert "Hiding markers bug"

This reverts commit 2a3804f5ea4c9fd5670de05406061e186097a1b4.
Revert "Revert "Hiding markers bug""

This reverts commit 6fab341ee12d2f296ab35cd38e160374fed190e3.
Last commit for tonight
asdf