Issue #356790 by vasike: Put back the default display and Use the Add link only if there's no result.