Fixes for orders visibility