fixes for the getall function