WP-2047 Updated the views inc