Improve raw view selection.