Add better sql-query for test page