Adding unit test for Issue #2 and fixing logic in view. Thanks unit tests!