Publish 5.8.6

Fix performance of the main Custom Display query