[#64343772]
Commented out changes on lines 251-266 as this caused problems with searching tables.