Table resolver fixed
Solution cleanup