Merged view logic fixes