Tidy up and tested for dynamically positioned columns on search results page