Another attempt to improve searchability